gitweb / test / file with spaceson commit mergetool: avoid misleading message "Resetting to default..." (d279fc1)
   1This
   2filename
   3contains
   4spaces.